Merge branch 'master' of https://github.com/marcbowes/cargo into pr-1094
authorAlex Crichton <alex@alexcrichton.com>
Wed, 31 Dec 2014 19:57:02 +0000 (11:57 -0800)
committerAlex Crichton <alex@alexcrichton.com>
Wed, 31 Dec 2014 19:57:02 +0000 (11:57 -0800)

Trivial merge